Don't use image-map if it isn't defined

* lisp/net/shr.el (shr-image-map): Only use image-map as a
parent if it's defined (bug#22614).

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index b1f2f0794a768ebc6ba481656b6d7c163b876f15..46aea79c32744badde10721c5f6c50938c9a4b28 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -189,11 +189,10 @@ and other things:
     (define-key map "\r" 'shr-browse-url)
     map))
 
-(defvar image-map nil)                  ;in case image.el is not pre-loaded
-
 (defvar shr-image-map
   (let ((map (copy-keymap shr-map)))
-    (set-keymap-parent map image-map)
+    (when (boundp 'image-map)
+      (set-keymap-parent map image-map))
     map))
 
 ;; Public functions and commands.